Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Customizable Armor #430

Merged
merged 196 commits into from
Nov 11, 2024
Merged

Customizable Armor #430

merged 196 commits into from
Nov 11, 2024

Conversation

Max-023
Copy link
Contributor

@Max-023 Max-023 commented Sep 3, 2024

About the pull request

Makes a new line of Marine combat armor that adds a new level of customization not previously seen, as well as recycles previous features that weren't able to be fully realized.

The first is that webbing is no longer available to attach to uniforms, and instead a new M3 compatible webbing line is provided to attach directly to the armor. The different types provide specific options for storage, coinciding with their name.

Next is that options previously not interactable now are. Marines will be able to decide if their armor will have the shoulder pads or not, as well as are able to paint a skull on their armor should they want one.

And lastly, Smartgunners are now able to paint their harness black. Huzzah.

Explain why it's good for the game

It gives a level of customizability to the game not previously had and makes a new level of aesthetic customization that differentiates everyone's Marine in their own special ways.

Changelog

🆑
add: Added new Marine armor that lack internal storage
add: New M56 harness that lacks internal storage
add: Added new M3 Pattern webbing to give different storage options, added to USCM Vendors
add: Added new M3-R variants of webbing for FORECON operations in their vendors
add: Two new storage clip on options for smartgunner harnesses now exist and are added to their lockers
add: M56 harness compliant machete to smartgunner lockers
add: USS Golden Arrow Cap now is available in the personal loadout section
add: Added new armor paints that can be selected from the loadout menu for painting icons designs onto armor
add: New M5 Camera Gear items to vendors for Solar Devils and Snake Eaters vendors, for those who don't want helmets
qol: Pauldrons, the Groin Plate, and Greaves are now optional for those that don't want them, all placed in the USCM Vendors
qol: For those who want the standard M3 armor set, a case can now be selected from the USCM Vendor
qol: Smartgunners no longer need a helmet for PltCos to look at their cameras, instead the headset does that
balance: Number of drop pouches increased to supplement storage
balance: SG Headsets are now required for IFF
fix: M37 guncase now properly has the correct amount of slots
fix: Earslot items now show over masks
fix: FORECON Lockers fixed
del: Solar Devils and MARSOC ERTs have been removed due to not being needed or being compliant with new custom armor
imageadd: Adds new sprites for the M3 and M3-R webbings
imageadd: Adds new back slot sprite for the smartgunner holster rig
imageadd: Adds new Marine headset sprites that are visible when worn
imageadd: M10 helmet cameras are now visible
imageadd: Helmet garb adjusted to account for M10 helmet cameras
imageadd: New, wide variants of helmet garb for UPP style helmets
imagedel: Deletes the padded, carrier, and skull armors due to unneeded redundancy
/:cl:

Dumbgunner added 30 commits March 27, 2024 15:58
This reverts commit b1f8fc5.
Copy link
Contributor

@Doubleumc Doubleumc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than that, code good.

code/modules/clothing/head/helmet.dm Outdated Show resolved Hide resolved
code/modules/clothing/head/helmet.dm Outdated Show resolved Hide resolved
@github-actions github-actions bot added the fix label Nov 4, 2024
Copy link
Contributor

@Doubleumc Doubleumc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There may be other hardcoded ...helmet/marine checks to stumble over but as far as I can tell, code good.

On related note I see you're needing to duplicate a lot of marine helmet behavior for your UPP helmets. It could potentially be simpler if it was a subtype of marine helmets, like ...helmet/marine/upp, so that it would inherit that behavior.

If there's some USCM stuff you don't want to inherit and can't override could alternatively have a generic "military" or "faction" type with the shared behavior for them both to inherit from. Resulting in something like ...helmet/military/marine and ...helmet/military/upp. This would be a lot more work upfront, though.

code/modules/mob/living/carbon/human/update_icons.dm Outdated Show resolved Hide resolved
@Max-023
Copy link
Contributor Author

Max-023 commented Nov 11, 2024

On related note I see you're needing to duplicate a lot of marine helmet behavior for your UPP helmets. It could potentially be simpler if it was a subtype of marine helmets, like ...helmet/marine/upp, so that it would inherit that behavior.

That was how it was before and unfortunately I couldn't find a way to get helmet garb to show without separating the UPP helmets from the USCM helmets.

If there's some USCM stuff you don't want to inherit and can't override could alternatively have a generic "military" or "faction" type with the shared behavior for them both to inherit from. Resulting in something like ...helmet/military/marine and ...helmet/military/upp. This would be a lot more work upfront, though.

I could try to make both under the parent of a generic helmet rather than have the USCM helmet be the default, but I would need assistance on that and I'd rather do a follow up PR to do something like that rather than continue to have UPP helmets bottleneck the entire thing.

@Doubleumc
Copy link
Contributor

Certainly. Those were meant as suggestions, not requirements. The only requirement was the code review there, which we're working on addressing now.

@Doubleumc Doubleumc merged commit f076c9b into cmss13-devs:master Nov 11, 2024
39 checks passed
cm13-github added a commit that referenced this pull request Nov 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants